<%@ page language="java" contentType="text/html; charset=UTF-8"
    pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
<<<<<<< HEAD
<link rel="stylesheet" href="css/style2.css">
</head>
<body>
	<header>
		 <iframe src="heade.jsp" frameborder="0"  scrolling="no" id="we" ></iframe>
	</header>
	<section>
	<footer>
		<form action="LoginServlet" method="post">
			<p>建材用户登录</p>
			<p><input type="text" name="username" placeholder="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;邮箱/手机/用户名"></p>
			<p><input type="password" name="userpass" placeholder="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;密码"></p>
			<p><input type="checkbox">自动登录<span>忘记密码？</span></p>
			<input id= "dl" type="submit" value="登录">
			<p>更多合作网站账号登录</p>
		</form>
	</footer>
	</section>
	<div>
		<iframe src="end.jsp" frameborder="0"  scrolling="no" id="end" ></iframe>
	</div>
=======
</head>
<body>
<form action="Ioginservlet" method="post">
	<input type="text" name="username">
	<input type="password" name="userpass">
	<input type="submit" value="登录"></p>
	</form>
>>>>>>> branch 'master' of https://gitee.com/zhangrtdong/guangdian
</body>
</html>